OPTIMIZE: Remove delaying plugins