Fixing comments, removing unused file