fix some typos
remove unused namespace