some final cleans to the activity stuff