Cleanup for our composer purpose.