Removed un-necessary private variables