Remove files which are no longer in use #2