Constants should be final, removed unused constants