Remove unnecessary code
Fix some travis building error