cleaned up obsoleted code