Nuke more code and make unit spec pass