cleanup of unused code + typos fix