removing some junk code