cleanup, removed useless variables declaration