Removed a lot of ifdefs