Refactor due to renames in User SDK, comment deletion, minor bug fix.