MISC: A little debloat here and there