GPII-20: Removed unnecessary dynamic: true statements