Some more cleanup to help stabalize.