CS fixes
Cleanup