Cleaning up
Merge
PartnerAlarms can be retrieved