Smass cleanup