Clean up imports / comments (minor)