Remove old files
Remove unused imports and functions