removed a bunch of extra stuff