More file and directory cleanup.