Removing name logic
Removing name logic