added some cleanup stuff