Delete empty line, delete un-used variable