Cleaned up, unneeded object variables