20141205 - Basic cleanup steps.