Cleanup for inclusion