Deleted unneeded is-statement and declarations