Remove some derprecation