Double check for class prefix removed