removed unnecessary and old lines