Imports cleanup