Further more cleanup