Made some less cleaning of unported code