Cleanup import references