Remove waits... they are causing timeout exception