Remove some unnecessary comments.
Change names of things for deployment