removed a few more defines that weren't required