Removed waiter utilization, cleaned the main
Removed more old code from the main and unused functions which were using the Waiter class
Merge branch 'factory' into dev