Removed some conditional compilation switches