1) Fix up imports to point to github instead of google.com
2) remove a manifest constant.