Remove httpextra code and update import paths