Uncommented and removed junk code