Remove more leftover fluff