Minor cleanup, removed some useless private fields.