cleaned up some messes.