BZ-9741 Cleanup