cleanup
Fix exception
WIP on indexes setup and activities deletion