Removed unneeded class variables