clean-up of helper class
clean-up of helper class
remove obsolete functions