remove unused imports and unnecessary boilerplate code