More deprecated stuffs removed