remove unused constants
style fixes