Remove ucollect related parts & add debug cli opts