#114 Cleanup