Updating.
Removing Code not used.
Changes