remove wait screen, until better implementation