Clean up for 8.1 projects