Remove legacy stuffs