Removing unused defines