cleaning up some useless defines