Removed unuseful code