removing bunch of unused code