Ashwin/Melanie | #3076 | removing unused methods.