Cleaning up defines