Remove unnecessary cert bundle
Fix misc bugs