removing unuseful code