removed factory
cleanup for collisions