Remove stuff that was moved into folders