Experimental code removed, accuracy tweaks optimized