Clean up code

- remove needless setting
- use cl-lib instead of cl