GPII-20: Removed dynamic default blocks