cleaned up some code that was not needed