Remove old commented out code, update jsdoc