removed unused functions
added refactoring to backlog