more spring cleaning of files