Experimental

Nothing new here, just cleanup of existing code.