Removed additional junk code