Merge "BUG-509: remove unused code"