Some setup related cleaning.