cleanup for 7.x-1.5