Remove CM's trebuchet in case on other launcher, also clean it up a little