Clean up import on Spike Version

Clean up import on Spike Version