refactoring

remove helpers, new helpers, specs