Remove 'return' statements