Remove the return statements