Removed useless legacy stuff that doesn't work anymore