Done some cleaning.