Removed more extraneous things