Merge "Remove redundant methods and refactor" into udc-qpr-dev