Clean up leftover fields and imports