Cleanup
Remove references to non-functional/unused constant