Removed unnecessary import and conversions