removed outscoped features