code clean-up (this should have removed the import that was causing build errors, too)