Fixed generating ids problem, added dynamic removal (WIP)