More extensive cleanup module