20141109 - Basic cleanup steps.