Removing undeeded code
Some typo fixes