Cleanup functional component for issue #10