Clean up comments and outmoded code