Deleted some more unecessary methods/variables.