Removed un-used vars. #MBL-10081