initial cleanup of board for v5