cleaned up constraints