#136 Cleanup