Cleaning up imports and commenting compat notes.