cleaned up production