clean up imports, update copyright dates