0.5.1 cleanup