Removed Bimap imports