Cleanup of constants