Cleanup bugfixing

Edit Activities removed by generic one
Cleanup