Removed unneeded #if statement