Removed some unused private fields