Removed unnecessary define statements