removed a bunch of ish