Update spec
Remove debug code