Removed a bunch of #defines