Above 2 lines should just be removed if they are really not needed