Performance tuning

Kill activity when starting another one