Remove try/catch + unused var + move comment