Improve stage registration logging
clean up commented-out code