DAR-2560, remove unneeded code