Clean up unused defines