removed some unused fluff