Some small cleanup. Added method to delete keys from disk.