removing a few lines of unused code