Avegare waiting time is now working, clean up packages