DAR-2525 Removing unnecessary variables