Cleaning up deprecated members.