Housecleaning, removing unused files / code