Removing unused properties + bug fix call label