Fix break build and remove file import