Remove some annotations and modify the import statements.