removes more legacy stuffs