Remove cruft from TestStartController