ticket: 8 Unnessesary lines removed