registration logic simplifications