Removed unused #if - #endif