Cleanup constants, etc..