improvements
removed junk