Removes convert usage
Removes unused imports