remove annotations
expandlink is in tomcat version
comment
cleanup
remove dependance on chopOffHostname