WIP : cleaned up typos, removed dead code