MP1-4155: removed old commented code