Preliminary Cleanup Steps