registration: removed unused code, fix get returns more than 2