Remove unused constants
Add missing from methods #502