removed 2 old lines