removing even more 3rd party code from repository