Clean up and refactor

* refactor `del` -> `remove`
* add fileKey
* manage errors when removing