Remove waitOn on home