removed a bunch of junk