Clean up a few comments and imports