Removed state all
Quick fix for xss hack
Quick fix
Merging from master