removed some #defines not in use