removed unused junk
fixes from removed junk