Remove more fluff