Cleanup + continue on register functionality