just removed a couple things