Tidy up notification subjects