Cleaned up unused parents. Moved set parents to after Resolver