Some more codecleaning.