Remove unused files
Fix two small bugs