fixes #4978 BZ1082698 - environment and content view no longer required

Cleaned up based upon p-r comments