Additional stuff gone
Additional changes