Small typos and remove variables not used