Some clean up done.