Removed unnecessary fields/methods