Clean up
cleanup
Cleanup
Xss vulnerabilities fixes