20141116 - Basic cleanup steps.