I agree. I feel that Head Graze and Suppressive fire should be made into the same ability, have their potency removed and give us an OGCD with similar potency and CD to takes its place. It'd be the same number of skills but just clean up the functionality I feel. Same could be done for other classes with similar issues.