Some cleanup for chaplin 0.10.0 update