Removed DEFINEs