Removed all unused ivars and two unused methods.