removed some legacy stuff