Adding indexes to activity model to speed up login
Removed indices
Renaming the activity indexes
Cleaning up merge mess