Remove remnants of round class