Removes #if from header class

preventing ugly bugs