Drop use of sisu-plugin & clean up.