#6 Removing an unneeded WaitWrapper class to fix compilation errors