Clean up catena.go