remove disabled code
change paradigm to pure import errors