Clean up unused variables
Replace tomcat task with the steps that actually worked