Added maintenance role and cleanup