clean up for 1.8.7