ticket: 6 unnessesary lines removed