Remove unecessary return statements
Merge pull request #748 from alexspeller/de-coffeefy

Remove unecessary return statements