Drop old implementations