Drop expired compat code