Make it easier to deploy at other sites. The configuration is too complicated right now.
Another more involved issue is to remove the trap requirements.