Cleaning up spike class