Remove keys method
Fix up jsdoc annotations