Cleanup and refactor

* refactor `del` -> `remove`
* add fileKey