Removed unneeded #if's