Struts config clean up Refs #625

Struts config clean up Refs #625 

We can put this on the master branch if that would make AIP happy.