feature remove: save in separate files