removed dead/unused code