Clean up comments and use statements