Handle class announcements
Do not remove methods on class removal
Merge branch 'master' into helios