Cleanup run steps

@kevgo