Remove original return call