Remove excessive "return undefined"