Cleanup cucumber scenarios