Applied Cleanup to several Activities dealing with editing audio/video. Issue #2037