Final cleanup for v0.4.2 release