Remove needless loading
Use cl-lib macro instead of cl