Clean up for html/jsp #2099

for #2099