Get rid of most Extras methods