more linting and a little bit of removing old unneeded stuff