Removing unnecessary default data and minor fixes

@obernal