attempt at cleaning up repository, hopefully didn’t break everything