Removed some legacy stuff