Cleanup of joernsteps + some new steps.