Final cleanup of  drawing method