code clean up - removed unneeded functions