default return and remove old stuff