Adding clean up for mate-media and engrampa