Continuing to remove unnecessary crap.