Remove unnecessary constant and debug code