Ditch legacy stuffs

Unless we have a good reason to keep it around?