Can't we remove this now?