cleanup and update to 4.2.0