if: some cleanup