Merge "BUG-509: Remove unused methods"