cleanup master

1.51 1.51c 1.51b 1.42 1.42d 1.42b 1.42a 1.5a