Cleaned up some unused fields/methods.