Updated to latest specs.

Also removed unnessary code from hummingbird.