Bunch of refactoring

- Remove unnecessary Retriever
- CommnadParams