cleaning up backwards compatibility code.