removed further usages of setter