bug in import
removed unused functions