[OE-3497] Removed redundant code from layout and from patientController