Cleaned up unused constants