Clean up imports and obsolete annotation