went a little overzealous in my cleanup heh