Simple Changes
Remove No needed Code