optimize imports and cleanup. assload of work to do.