cleaned up some unused changes