cleaned up some dead code, etc