Remove hardcoded user class name