Ashwin/Melanie | #3007 | removing unused code.