Revert 4952c52..efff2d6

This rolls back to commit 4952c52e54a2901799a7a124eb4b54254f3b229a.
Revert 68a08f0..ffb1015

This rolls back to commit 68a08f05b35dcfb4d9586c5ee9e0c4e24d978155.
Revert "Added Wait staff functions back"

This reverts commit b515280bc23fa563fb56a5cbb96205e7cc805c17.
Revert 68a08f0..257c7c7

This rolls back to commit 68a08f05b35dcfb4d9586c5ee9e0c4e24d978155.