Remove unused file
CS fixes and some small simplifications