Remove unnecessary crap... why is this stuff even here?