Cleared some useless ifdefs