further refactoring (deleting)