removed calls of helper classes