file cleanup, move onconstruct wrap to config