Adjust, cleanup imports