Seems return not necessary. Clean up possible here?