Clean up usings
Merge remote-tracking branch 'origin/master'
EmergencyRoom: Start adding WaitQueue aggregate