Removed Dead code

Removed useless else blocks because of returns.