cleaned up some unused code