Change wait method to not use waits
Remove extraneous beforeeach definitions