Fixes #697 - Cleanup activation