removed junk vars