Okay, more cleanup..