more setup
removed junk