Removing things that were brought over from base code.