Unnecessary class calles removed