Remove depreacted code