clean up to avoid collisons on fast development