Removed more unuseful code