Even more cleanup...