update CHANGES and README to reflect recent changes
remove single line of unreachable code