Removed junk code