delete polluting code
merge fixed