#73 Cleanup