0.5.15 cleanup and prep