Got rid of some unused methods.