Some cleanup in the react components