Experimental (and easier) full run

Also remove unused usings