Removed unused constants and imports