removed a ton of junk, i think