File removing added to service. Some code refactoring.