ticket: 9 Unnesessary lines removed