VP-297: Removing un-used code