Removed some unnecessary code

Suggested code tidy - remove unnecessary code