Added is active check
Collect objective is no longer removed on inactive
Removed old code omments