1st cleanup pass of General module