Remove some utils