Fixed phpdoc, removed unused code from LabelFactory