starting cleanup for 2.5