Removed leftover members.
Removed unused variable.