Cleanup the defines