Removed CATALINA_HOME