Remove Grunticon and adjust Baseline Assesments