Removed unnecessary util files from master_src