Delete some legacy code