Fix a few linting errors and delete old files