some legacy problems removed