move patches to central place
remove dead make code
remove dead cleanup code