Remove defines, clean up code