Clean up backwards compatibility checks