This reverts commit 8c291bb1
because a pile of stuff then crashes, its not sufficient
to remove things from .ui files if there are still used but
the cxx. e.g. opencl options page

Change-Id: Ice608af7e4a3f7798183a45602715ab04afbc87a