#131 Cleanup