Remove dead file
Fix comments