#805 - cleanup