spike03: clean-up