Cleanup: removed unnecessary imports