Revert "Should take care of #88 - Name Picker - Phase 1"

This reverts commit 1beea80640d7bd40534a80915c6dbb91ab23f589.