Removed all references to struts