removed junk func