Some cleanup of files moved elsewhere.