Fixed import and cleanup