removed references to parent scope that are no longer necessary