cleanup for 0.5