Cleanup file steps

@kevgo