clean-up unneeded test code