removed unuseful code