Removed this references per design decision.