code clean up - removed unneeded functions
code clean up - removed unneeded functions