Removed some code which had alread been disabled via the preprocessor.