Cleanup, finished param read, ready for testing