removed unneeded/unused code. clean up.