Remove extra return statements