Remove conditional from class definition