more tidying up, removing unused files