Use pluto where possible instead of hic calls

Use pluto where possible instead of hic calls #1650