Removed the Statement field and unused imports