renames and removals to get to work