Removed #ifdef