Removed Junk code