Fixes more extraneous code