ticket: 9 Unnesessary code removed