Removed JS class switch