Cleanup compat

closes 1878