Remove unnecessary comment
Remove unnecessary routing
Add minimum validations