remove deprecated stuffs